UI optimization

- Small UI fixes