Improve logging

@maxfliri
Fix markup in upload page

@maxfliri