Dev Made timestamping check if the fields exist first
Dev Small CSS changes