Changed some js
little grafical changes at project show
Fixed automerge problems