minor snags
updated dashboard for mobile devices
updated conflict