Minor fixes

1. Manage account views splitted.