Some styling
merge