Fix bugs and create Dashboard