Fixing dates and layout crap