Issue 7

- A few fixes to issue 6 and CSS