Fixed bugs with cookies + graphic improvements