My work on revampinig the UI