Options markup/logic added