fixed layout, added missing parts