Updates, some layout changes, fixes.