Improve styling