UI Change by wuxiang 2014 06 15