home page logo fix
supervisor panel
merge conflicts