Improve design
Fix to be able to delete an account