more UI tuning, still working on edit