added setup (wip) and ui fixes