Merge "Laas Dashboard Front End Improvements"