Fix merge conflict
Change actions to verbs to improve readability
Change static file loading for production