DAR-663, fix layout bugs for liquid layout