Finished work on JobWindow and JobController + minor changes