Changes for Motivator & WorkingStyle screens