Add more styling
Fix merge conflicts