styling additions
merge styling