Some UI tweaks and a little reorganization