UI modifications bug fixes