added action bar
added cold context aware
UI changes
merge fix