fixed FF transition bug, minor layout changes
fixed FF transition bug, minor layout changes