Merge pull request #10 from Jeaye/master

View items must go first
Fixed errors with Unit-like structs