Adde new class and reworked layouts
Merge remote-tracking branch 'origin/master'