added basic styling
merge