Menu. Some bugfixes.

Fixed #8
Fixed #4