Add architecture info and related fixes
Adjust CSS