favicon fix
upload bar fix
fix merge conflicts