fixing issue with account view and other stuff