polish up markup, and begin fixing the edit page