TODO : Enhance UI / UX of button {X}