Track view impoved and many another changes