added files for prompt view and fixed my mistakes
Merge remote-tracking branch 'origin/master'