added shark / ui improvements