Updated the layouts, added comments