BER-02

Master layout has been tidied up but still has more work that needs to
be done to it.