[ModView] Added toolbar and some code cleaning