Try to fix layout issue