alerts mockup & layout fixes