Changed so that options are proper values

also fixed user interface so switches work
Making lights go left to right