Cleaned up html generation a little