Cleaned up code and corrected some page navigation issues

Still need to fix further navigation issues when escaping like listed as
NEED TO FIX in mediaviewmodel.