Cleaned up the different pages