minor UI tweaks and bug smashing