re-organize my page from before