fix some deploy issues
Improve legacy page layout a bit