Some more classes, and javascript so it can pop..
Type fixes.