Flux layout - fix 100% bug and refactor

Fix bug with 100% width definitions and refactor code to use common prefix.