[WIP] Fixing a few style things, moving image handler to its own namespace