Work on setup window, time recording, toolbar enhancement