140121 Merged all - UI by yoonah & viewactivity by rang