markup and widget fix