New ui

clean bug on master for onResume