Dashboard completed, bugfix