Mostly done...

I'll commit some css stuff later today.