Added a few more screens, modified var service to hold keyboard state