Finished layout changes