Cleaning up UI formatting