some changes and ui config