Rules updates and ui changes for dashboard