GUI modified - started on MANUALTRACK
Merge origin/master