Handle more activity

Handle more activity and improve UI.