Cleanup

Starting to cleanup and change css naming conventions a bit