small tweaks, same functionality as before, added main wrapper for entire page content