Todos

This is mostly style and layout clean up. You guys might have some changes for me monday.