Version 2 - fixed panel alignment for M8
Tried to fix the panel alignment for M8