layout fixes and more