continued draft for new layout
Added index to foreign key to improve performance