Header Animation Adjustment & Picking Bug Fix