Minor DB query additons (and CSS tweaks)