Some refactoring, Changed button font to Helvetica Neue.