Fixed unused imports
Fixed bugged menubuttons
Fixed merge conflicts