Build Dashboard and some fixes