Minor refactoring and logo letter spacing adjustment