Update layout to fit better