Activity should match ppt. Fixed other things here and there for views.
Added navigation bar highlighting.