Updated GUI and added more logging