Further cleaned up page