Flux layout

#18