bootstrap, layout formatting
merge master
finish initial layout