Fixed dynamic click events, small changes to HTML