Add user config handler; some ui fixes;