Layout changes and fixes