I would get rid of the error message above since we now also have one below. Looks sane for the rest (haven't tried though).