Cleaned up config
Changed port to 8080 due to proxy
Merge branch 'frontend'