Made lots of changes to the UI designed
Major Changes