Flux Layout - border-box

Apply border-box to everything and a-little refactoring.