Reworked account view