[Upg] fix messages margin & add navigation