Switched to gridbaglayout
Done part 1
Calculator part 1