upgraded dashboard controller
test
fixed conflic and added functionality to dashboard controller