Speed up overall UI

Change-Id: Ie076d5fe5c3c975b84a31acd65d92ade83404625