Remove commenet
Minor layout changes
Integration test to revail the bug with date binding