Changes the layout to linear and moved some comments around