Committing UI fixes