Update layout to fix weird display bug