MLDS-22 Fix minor panel collapse issues