Eep!  I guess I'm a little late to reply.  Really
great update ;) 

I know exactly how you feel about how time
consuming a site can be.  I am *trying* to get
mine overhauled and opened but every time I sit
down to do it I get disgusted at how time
consuming and tedious it gets, so I can only do a
small amount at a time before I start wanting to
bash my head into the keyboard.  

I used to have a format a little similar to what
you are talking about and it drove me insane. 
Every time I had to change or remove something I
would have to change every link below it like 4 or
5 times too.