Cleanup and added dashboard settings form