Improve account menu