UI Modifications and bugs resolved