Updated readme, fixed various visual bugs
Undid some buggy refactoring