More restructuring done, mainly to the account views