Small CSS cleanup
TODOs added
Export member variables