added tracking code preview and improved layout