redesigned mark up, fixed network bugs