Update markup and stuff