Fixing CSS issues for #22