Fix some indention and comments
Add active styling and tweaks
Fix indention
Tweak error style