Code Refactor + several visual improvements

Code Refactor + several visual improvements