design fix
js fix
fix php cli calls
fix php cli calls