Moved button html to template. Updated unit tests.