updates to messages and some layout.

Signed-off-by: Ketan Majmudar <ket@spiritquest.co.uk>