Finished update screen

Fixed order, did disabled fields, etc