Try to fix layout bug