Last minute fix 2
Last minute fix 3
Few changes in the UI