Done some cleaning and prettying

Final Idea: http://puu.sh/dCafC.png
git derped