Add menu and some other features