GUI changes - Based on Chill ;)