Merge nick's changes to default.aspx