Better handling of slider widget

Plus a bit of header cleanup