Dashboard fixes & add specs