best_in_place fix and some more UI tweeks