Further improve styling