ux tweaks and cleanup