Update layout to be more adaptive