Issue 128

This should probably follow the rest of the project's code styles.  Less echo and more html.