Dashboard and other fixes