Modified some UI code and did other stuff
Merge branch 'master' of https://github.com/Luxtylo/note-epq

Conflicts:
	Source/Functionality/function.py