Code formatting/minor refactoring, UI redesigns