Minor ui bug fixes