More semantic layout work
Fixed enumeration
Additional unit tests for placement
Tests and more enums