Multiple Fixes, see description

Fixed includes
Added "@grant metadata"
Fixed form selectors
Fixed hiders