Cleaned up user and dashboard