fixed layout and tab changes