Some more tweaks to make it look nice