changed some names and labels
changed layout of header