Refactor some of the code. Add image type submit buttons. Fix button markup.