Minor GUI and Core updates