Appearance fixes and removal of deprecated stuff