Added Tracker and Fixed Layoutbug in Projects