layout & design update