Long missing upgrades

Added missing upgrades, and changed the layout slightly.
Removed unnecessary closing tag in id="ponyimg"