added helpers. changed less layout