Redesign UI

Change-Id: Ieccb2ca486a80f51bbb60f4031a69437dce13f22