added timer, fine tuned submit buttons