changes from balupton's layout to mine