UI fixes initial version