fixed, no longer able to edit attribute names
Layout fixes
Merge branch 'master' of github.com:ROLL-E/roll-e