Nightly commit
 - Added Options Screen (to later complete)
 - Added minor comments