working on simple styling
merged