Revert 0efa1a6..8353ed0

This rolls back to commit 0efa1a6cd613fcc5169c3abae7ba083b8b2780cd.
Trying to get modal page back