Finish UI tuneups