Layout
Returns Fix
Merge branch 'feature/Returns' into develop
Random Fixes before Leaving