Added next up events controller and change weather location into small calendar