Cleaning up code and adjusting styling

I still need to get rid of some of the razor code and utilize more rx