Done-details

!style="background:#336600;" |DONE (needs fix some details)