Small design fixes

Conflicts:

	templates/digipal/image_annotation_settings.html
	templates/digipal/image_list.html
merged