Moved styles into more sensible location, cleanup up styles