TabHost working
Merge branch 'details'