remove  hardcode in views:)