Added code to visually improve the page
Cleaned up and moved out code