Merged layout into master