HCSVLAB-153 Small routing and account menu improvements