Changes in templates hierarchy + some minor fixes

I think such hierarchy gives more flexibility
+content
+progressbar ( currently not working)