Moving to single page format, cleaning up look and feel