Add menu and some little bug fixes