Removing class logo and bugfixes