fixed margin
updated messages