Cleanup

Cleaned up a lot of stuff. Updated template default styles.