Some simple layout fixes and updates