Added id tags to buttons. Made templates more uniform.