Add cookies and more beautification