Changed editable fields a little, and cleaned up whitespace