replaced timeout
fixed minor display issues