Fancify the caption background
Merge
Remove stray code
Merge
Remove edit link (accidentally added back during merge)
Fix add form