improved UI && some handling done.