Added timer and improved graphics drawing