Changed label and added button
Added date picker