Layout updates, fix return type of date