Tap fix + liquid layout fix + focus fix