Ui/enhancement

Solves all the UI styling and modified the layout.