Minor updates to Layout and ModelView Helper