ui improvements && some fixes