Layout changes and cleanup