Fixing up forms page