Fixes #32 and related CSS