Lots of user interface prettification, layout fixes