Updated with customizable dashboard