Refactor.. new ui... use activities