Basic on-screen editing works

Basic editing on the main screen is working. Now we have to enable it
for all the other screens.