Added rough version of main screen, fixed test