Some layout changes and other tab changes