Tidied post layout, moved contents around