Remove the annoying full size view popup.
Refactoring.