Improve resolver layout in case package name is shown.

Change-Id: Ib2bd0c19727194205b6e4114c34bf96663030d5f
Fix ordering of home keypress handling

* Home keypress handling was done out of order, causing an extra go home
  action to be executed.

Change-Id: Ieb2f6ffbf6d1e18a5d4602975f48717089e5c9dc