Small screen model change to make viewing more consistent
Adding seats is basically working
Temp commit
Restructure adding screens
Viewing and adding screens reworked
Fix merge conflict