Some other minor UI improvements