Refactor

Major code refactors, basic UIs added