Updated form looks. Minor functionality updates