fix dates and some layout