tweaks ot icons and first attempt at a proper template