changes fully integrated

Tam and Andrea's dashboard/ edit form style changes added in