Added options screen, bug fix