tidy up them buttons
Dumb image caching
Avoid invoking NULL blocks