Added new class and reworked layouts