Added a few fields. Style issues on phone.