Improved dashboard template