layout fixes and improvements