Feature/5 edit main view review2

Hi Juan,

here is the pull request.

thanks
tobi