bugfix + better menu