Fixed a few design issues with multiple pages