Solved up to problem 18 and made minor GUI fixes