some bug fixes + customizations for um theme