Fix 'Upcoming Training' toggle. Margin adjusmtents. Add back Search in smartphone view.