Converted to more circular layout
Removed test pages for old layout