Added check for empty value
updated some styles in views