Better looking options page
Changes in TODO