minor fixes and tweak page layout