Restructed code, broke statusbar and options