Minor ui/ux improvements