Issue/#494

Fixes #494 and various css issues