Added additional helpers and styling. Need to fix forms