fix layout and info messages