Minor ui ux improvements