Started fixing GUI to make it look better