Add alert + cosmetic fixes