#issue 24 optimizing and formatting code for options screen