Added better styling
merged