Added more code for options screen