Commit 13 - Complete Layout change