Added Option formlet and WS fixes