improve account views
merge nav