Cleaned up html and added triggers