Added calendar and fixed selected links