Major changes and fixes, added custom page templates