Dashboard complete and bugs fixed