Fixes a seiries of merge errors and what what not
Also fixes the back button for the select time screen in the computer