rearranged some demo markup