Update image
Move stacks up
A few more tweaks