Added UI for timeLimit and maxMove
+ small refactors