Major improvements on Dashboard