Task #43 done + changes in UI