Refactored code, finished U.I creation