ui added.. few fixes ..