Layout tweaks after changing the paint image