Finish up the layout changes, Adjust some API requirements