fixed styling and fail over