added a message and better formatted margins