Update layout and reformat code to follow the base example