Removing emergency button, adding in faculties
Espresso storage will not be ignored!