UI Refactoring, minor additions, lots of things need to wrapped in try-catch
Fields fixed
merge fixed