Some work on options window + celsius fix