Swap things around a bit and be able to hide push stuff if it is not working