Trying to fix #4
Styling fixes
Trying out ideas