small bug fixes.
Reorganize jsp fragments.
Fixes for signup form.