restructured layout html, replaced w2ui, added bootstrap, fixed broken tests