Refactored code; Cleaned up page display;