fix failing SF E2E tests
wip: image upload E2E
re-layout for PSR-2 style guide