changed order markup and a few design adjustments