upload path fixes and custom css
conflict fixes