Changes to application site

Mick still needs to add Wufoo application, thanks Mick!
fix merge conflicts