new layout, added missing pieces