Refactored modal popup to not use hash and scrolling to top