First commit on Master Layout