Refactored tableview and edited track view