-- minor scurity changes + underlined current page