work:layout is cleaned up. working on styling date fields next