Various improvements

Layer mapping is less verbose
Proper comment and name hiding
Components without component bodies