Added error message styling
Added tooltips
Fixed merge conflict