Fixed template and some archives page
Fixed last commit