Use action bar icon as home
Combine layouts
Fix layout
Various improvements