add date updated and buttons, etc. and Icons.
merge fixes