fixed spinner
fixed a few z-index issue for component