Issue/#494

Fixes #494 and various css issues
I did think about this - and probably one we discuss. Multi-tenancy would be affected by this. But also storing somewhere on the server could case some other issues...