Switched to MVP

Removed the old screens and replaced them with the newly added MVP
versions.