Layout changes to make things more useable