Added dashboard controller and some changes