Remove obsolete break statement
Fix a few issues
Fix tests and css