Get rid of two already finished items on the TODO.txt and move back the buttons in the Settings form which were slightly moved by accident