Few small tweaks
Few small tweaks
Fixed back button
Merge conflicts