Refining the UI and bug-fixing