Hopefully, UI fixes are finalized