More efforts to do it responsive