Fixed markup of base page
Added javadoc