UI fixes after merge