Clean up code for easier copying around of code blocks to different layers

Clean up code for easier copying around of code blocks to different layers, by doing the following:
- Add explicit tunnel and bridge selectors in tunnel and bridge layers
- Make sure each feature-selector has its own line
- Adapt indentation to new situation

This causes no changes in rendering.
Temporary commit