UI & GPS Track Fix

UI & GPS Track Fix