Fixing date and layout bugs