Account view, few tweaks