Added menu and fixed performance