Batch of UI fixes