revised panel order and added mixins