more UI changes (working)