Cleaning up layout on 7-inch tablet
Updating version