Modal: use $.extend to build modal settings object
Session: fix modal-dialog behaviour of "timed out" message

Also corrected double spacing issues.