cleaning up some headers for mobile & consistency