Popover and alert info added, move alerts to a single class