account panel and permissions
merge conflicts fixed
conflicts fixed