Move boxes code to default layout
about edits
consolidate stuffs