Form rewording and tweaks
Added data dir to grunt copy