added popup and fixed mark up mistakes