Fixed few isssues on UI