Fixed user menu

Fixes #149
Fixes #151