Fixed figures matrix and definitions
Improved Styling