Added Fixes
Added Sidebar and Fixed Issues with Timing