tweaking layout for more space and less scrolling
Add message in code block
Merge our changes together