Prettify pages and some other fixes