Added message.html template and small fixes.