fix layout issue. fix unsafe url issue