Making deployment changes
Merge branch 'dev' into presentation
fixing some OCD padding
Merge remote-tracking branch 'origin/dev' into presentation