Bug Fix and UI improved