UI fixes after client revision