Added Patrick's changes to the new layout