Fixes #25 User menu