#1744 | Minor UI fixes