Add markup and "Add option" functionality