SW-157. SW-158. SW-159. Small changes to web interface.