Cleaning up UI further..