Temp Branch

Database was reset and it broke stuff
Merge branch 'broken_welcome_index' into layout