Advertisement - Fixed several bugs