Improve styling and markup layout