made the required changes to the ui, made the website 1240px wide for display, and removed some old stuff from the old template
fixed the master page conflict
Merge pull request #140 from maronin/playingWithUI

Playing with ui