Updated Layout

Updated Layout:
Created "Widgets" as frames to group items

To Do:
Fix horizontal sizing issue