Before presentation

Some UI changes