Adding Dashboard and some changes