working on rearranging content