Fixes #47
Fixes #48

Functionality is there, needs a bit of css