Layout updates & minor fixes, improvements