Small fixes and rewrites, added page layout option for clients