noBack bug fixed + some UI changes.
Merge with master.