Added/fixed helpers + some style changes