Configuration window simplifying, few fixes