use the right layout
add back to home screen on detail activities
Merge branch 'pr/5'