goal status on goal screen
Merge branch 'goals'