Added to TODO and changed setting on mainwindow