Issue #121 - Edit UX
Issue #121 - Fix Redirection issue and Scroll