updated layout, new classes