layout fixes and stuff