Updating core funtionalities + Fixing some bugs + Updating UI