Removed Alert and fixed scrolling