add time interval
add padding to form
fix code organization