Merged in some dashboard layout updates and purple ABORT