Fixed all of GUI - is nice!