allow passing classes to buttons
move upload dialog css to separate file
simplify conflict template handling, fix reopen after ESC