Moved the messages block

Makes more sense down below