Updated with styling changes