Cleaning up the modified tablet ui to better suit all devices.

Change-Id: Id19a62d97bec143d6af1b059a9d40d453f892f51