Issue/#494

Fixes #494 and various css issues
formatting/indentation in this file is a bit wonky