alot of changes, refactoring, style tweaks, custom back button action