update error message
remove new lines
organize partial view calls