More stuff
work on modal home and index
fixed conflicts