Avoiding null pointers if message dictionary is not set.
Fixing toolbar positioning issue.