Removed gen files (finally) and fixed styles