Restructured code, broke statusbar and options