fixed helpers, added logic and styling