Update layout and remove unused code block