fixed timing issues
fixed layout