Fixing a few ID/class issues