mad updates style and layout wise. Cleaned up a lot.