tweak UI and add TODO to core