Readjust panels. Remove null error in modals.