Updated Options Menu Control and View
Merge Battleship/master