some helpers fixed up. improved styling