Updated field types & logout btn